From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 24 Nov 2009 08:37:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9284
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=596cf4cffa0b6f89e94e677cdde5418a81d3533e;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3fa40e6732a..2e1f1d68f20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* font.c (font_open_entity): Don't use ASET if font_object is Qnil.
+
+	* xterm.c (x_new_font): Update f->scroll_bar_actual_width.
+
 2009-11-24  Glenn Morris  <rgm@gnu.org>
 
 	* frame.c (focus-follows-mouse): Mention mouse-autoselect-window.